From c530aaacc2319ccf64f89ef98b5e190ab85c7bcf Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 26 Mar 2010 10:28:37 +0000 Subject: [PATCH] cpufreq: don't re-init active dbs timer in S3 or cpu online Signed-off-by: Wei Gang --- xen/drivers/cpufreq/cpufreq_ondemand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/cpufreq_ondemand.c index d4d43f4a34..5728a8fbaf 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -196,8 +196,9 @@ static void dbs_timer_init(struct cpu_dbs_info_s *dbs_info) { dbs_info->enable = 1; - init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, - (void *)dbs_info, dbs_info->cpu); + if ( !dbs_timer[dbs_info->cpu].function ) + init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, + (void *)dbs_info, dbs_info->cpu); set_timer(&dbs_timer[dbs_info->cpu], NOW()+dbs_tuners_ins.sampling_rate); -- 2.30.2